[#9429] improvement(core): Use join to improve query performance on table, topic and so on. #9430
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…e, catalog, schema, and table tables
Contributor
Author
Before
After
profiler |
Contributor
There was a problem hiding this comment.
Pull request overview
This PR introduces performance optimizations for table metadata queries through database indexing and a new query method, plus adds Caffeine-based caching for Metalake entities. However, there are several critical issues that must be addressed before merging.
Key changes:
- Added composite indexes on
(name, deleted_at)columns across metalake, catalog, schema, and table metadata tables - Introduced
selectTableByFullQualifiedNamemethod to query tables using fully qualified names with JOIN operations - Added Caffeine cache for
BaseMetalakeobjects inMetalakeManagerwith automatic expiry and cleanup
Reviewed changes
Copilot reviewed 11 out of 11 changed files in this pull request and generated 8 comments.
Show a summary per file
| File | Description |
|---|---|
| scripts/h2/schema-1.1.0-h2.sql | Adds composite indexes on name and deleted_at columns; contains critical bug on line 66 |
| scripts/h2/upgrade-1.0.0-to-1.1.0-h2.sql | Migration script to add indexes for existing H2 databases |
| scripts/mysql/schema-1.1.0-mysql.sql | Adds composite indexes on name and deleted_at columns; contains critical SQL syntax error on line 83 |
| scripts/mysql/upgrade-1.0.0-to-1.1.0-mysql.sql | Migration script to add indexes for existing MySQL databases |
| scripts/postgresql/schema-1.1.0-postgresql.sql | Adds composite indexes on name and deleted_at columns |
| scripts/postgresql/upgrade-1.0.0-to-1.1.0-postgresql.sql | Migration script to add indexes for existing PostgreSQL databases |
| core/src/main/java/org/apache/gravitino/metalake/MetalakeManager.java | Implements Caffeine cache for metalakes; has error handling and resource cleanup issues |
| core/src/main/java/org/apache/gravitino/storage/relational/mapper/TableMetaMapper.java | Adds new mapper method for querying by fully qualified name |
| core/src/main/java/org/apache/gravitino/storage/relational/mapper/TableMetaSQLProviderFactory.java | Adds factory method for the new query |
| core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/base/TableMetaBaseSQLProvider.java | Implements JOIN-based query; contains critical SQL injection vulnerability |
| core/src/main/java/org/apache/gravitino/storage/relational/service/TableMetaService.java | Updates table lookup to use new optimized query method |
Comments suppressed due to low confidence (1)
core/src/main/java/org/apache/gravitino/metalake/MetalakeManager.java:90
- The
close()method does not clean up themetalakeCacheor shut down the scheduled executor service used by the cache's scheduler. This can lead to resource leaks when the MetalakeManager is closed. AddmetalakeCache.invalidateAll()and shutdown the scheduler's executor service in the close method.
@Override
public void close() {
// do nothing
}
core/src/main/java/org/apache/gravitino/metalake/MetalakeManager.java
Outdated
Show resolved
Hide resolved
core/src/main/java/org/apache/gravitino/storage/relational/service/TableMetaService.java
Show resolved
Hide resolved
...a/org/apache/gravitino/storage/relational/mapper/provider/base/TableMetaBaseSQLProvider.java
Outdated
Show resolved
Hide resolved
core/src/main/java/org/apache/gravitino/metalake/MetalakeManager.java
Outdated
Show resolved
Hide resolved
...a/org/apache/gravitino/storage/relational/mapper/provider/base/TableMetaBaseSQLProvider.java
Outdated
Show resolved
Hide resolved
Contributor
Author
|
With 30000 tables under two catalogs 
|
core/src/test/java/org/apache/gravitino/storage/TestEntityStorage.java
Outdated
Show resolved
Hide resolved
core/src/main/java/org/apache/gravitino/storage/relational/service/SchemaMetaService.java
Show resolved
Hide resolved
jerryshao
reviewed
Jan 4, 2026
core/src/main/java/org/apache/gravitino/storage/relational/service/FilesetMetaService.java
Outdated
Show resolved
Hide resolved
mchades
reviewed
Jan 8, 2026
mchades
reviewed
Jan 8, 2026
Contributor
mchades
left a comment
mchades
left a comment
There was a problem hiding this comment.
no more comments.
would you like to review again?
mchades
approved these changes
Jan 9, 2026
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
This pull request introduces major performance and functionality improvements to the Metalake and table metadata management system. The most significant change is the addition of a Caffeine-based cache for Metalake entities, which reduces redundant storage access and improves efficiency. Additionally, it adds a new method for querying tables by their fully qualified names and optimizes database schema indexing for faster lookups.
Metalake caching and management improvements
metalakeCache) inMetalakeManagerto storeBaseMetalakeobjects, with automatic expiry and scheduled cleanup. This cache is now used inmetalakeInUse,loadMetalake, and is invalidated on alter, drop, enable, and disable operations to ensure consistency. [1] [2] [3] [4] [5] [6] [7] [8] [9]Table metadata querying enhancements
selectTableByFullQualifiedNametoTableMetaMapper, its SQL provider, and the service layer, allowing retrieval of table metadata using metalake, catalog, schema, and table names directly, improving query flexibility and performance. [1] [2] [3] [4] [5]Database schema and indexing optimizations
idx_name_da) on themetalake_name,catalog_name,schema_name, andtable_namecolumns (withdeleted_at) in both H2 and MySQL schema scripts, significantly improving query performance for lookups by name. [1] [2] [3] [4] [5] [6] [7] [8] [9]Why are the changes needed?
To improve performance
Fix: #9429
Does this PR introduce any user-facing change?
N/A
How was this patch tested?
Existing test